Merge pull request #338 from JaKooLit/development

Development to Main including pre-release

1 files changed, 5 insertions, 26 deletions

diff --git a/config/waybar/style/[Extra] Mauve.css b/config/waybar/style/[Extra] Mauve.css
index cfdec9a1..120b5389 100644
--- a/config/waybar/style/[Extra] Mauve.css
+++ b/config/waybar/style/[Extra] Mauve.css
@@ -16,23 +16,16 @@
 window#waybar {
 	background: #11111b;
 	color: #cba6f7;
-	/* background-color: transparent; */
 }
 
 window#waybar.hidden {
 	opacity: 0.5;
 }
 
-window#waybar.empty {
-	background-color: transparent;
-	background: #11111b;
-}
-
+window#waybar.empty,
 window#waybar.empty #window {
 	padding: 0px;
 	border: 0px;
-	/*  background-color: rgba(66,66,66,0.5); */
-	/* transparent */
 	background-color: transparent;
 }
 
@@ -49,7 +42,7 @@ tooltip {
 .modules-right {
 	border: 3px solid #11111b;
 	border-radius: 10px 10px 10px 10px;
-	background-color: #1e1e2e;
+	background-color: #313244;
 	padding-top: 2px;
 	padding-bottom: 2px;
 	padding-right: 4px;
@@ -67,7 +60,7 @@ tooltip {
 	/*background-color: #1e1e2e;*/
 	border: 3px solid #11111b;
 	border-radius: 10px 10px 10px 10px;
-	background-color: #1e1e2e;
+	background-color: #313244;
 	padding-top: 2px;
 	padding-bottom: 2px;
 	padding-right: 4px;
@@ -86,6 +79,7 @@ tooltip {
     transition: all 0.5s cubic-bezier(.55,-0.68,.48,1.682);
 }
 
+#taskbar button.active,
 #workspaces button.active {
 	color: #1e1e1e;
 	border-radius: 30%;
@@ -100,7 +94,6 @@ tooltip {
 	color: #1e1e1e;
 	border-radius: 30%;
 	background-color: #cba6f7;
-	border: 0px solid #1e1e2e;
     padding-left: 6px;
     padding-right: 8px;
 }
@@ -115,6 +108,7 @@ tooltip {
 	color: #1e1e1e;
 }
 
+#taskbar button:hover,
 #workspaces button:hover {
 	color: #1e1e1e;
 	border: 3px solid #1e1e2e;
@@ -189,21 +183,6 @@ tooltip {
 	}
 }
 
-#taskbar button.active {
-	background-color: purple;
-    padding-left: 12px;
-    padding-right: 12px;
-    animation: gradient_f 20s ease-in infinite;
-    transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
-}
-
-#taskbar button:hover {
-    padding-left: 3px;
-    padding-right: 3px;
-    animation: gradient_f 20s ease-in infinite;
-    transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
-}
-
 #battery.critical:not(.charging) {
 	color: #f53c3c;
 	animation-name: blink;